JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
173,859 Commits 2 Branches 0 Tags 13 GiB
50a4de7326
Commit Graph

664 Commits

Author SHA1 Message Date
Lancelot SIX
1670fd115d
postgresql_9_6: 9.6.10 -> 9.6.11 
See https://www.postgresql.org/about/news/1905/ for release information.
Fixes CVE-2018-16850
 2018-11-09 09:42:44 +01:00
Lancelot SIX
f703ea62a0
postgresql_9_5: 9.5.14 -> 9.5.15 
See https://www.postgresql.org/about/news/1905/ for release information.
Fixes CVE-2018-16850
 2018-11-09 09:42:44 +01:00
Lancelot SIX
882c3b529c
postgresql_9_4: 9.4.19 -> 9.4.20 
See https://www.postgresql.org/about/news/1905/ for release information.
Fixes CVE-2018-16850
 2018-11-09 09:42:44 +01:00
Lancelot SIX
5d37d63388
postgresql_9_3: 9.3.24 -> 9.3.25 
See https://www.postgresql.org/about/news/1905/ for release information.
Fixes CVE-2018-16850
 2018-11-09 09:42:37 +01:00
Austin Seipp
4569ee7d74 plv8: unbreak build, bump to version 2.3.8 
ee58a5b30d broke the plv8 build because it
upgraded the v8_6_x expression everywhere to the 6.9 branch, which came
with API changes. Notably, it seems plv8 only supports up-to v8 6.4.x at
this time.

This keeps a copy of the plv8_6_x expression inside the same directory
as the other v8 versions (so patches, etc are easy to apply), but it is
not exposed to the top-level of all-packages.nix.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2018-11-04 08:24:19 -06:00
Austin Seipp
b0f7c86094 timescaledb: fix license (Apache 2.0, not PostgreSQL) 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2018-11-04 07:30:23 -06:00
Austin Seipp
800184df21 tsearch_extras: 0.3 -> 0.4 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2018-11-03 19:53:52 -05:00
Austin Seipp
d8abcdc1de pg_topn: 2.0.2 -> 2.2.0 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2018-11-03 19:53:46 -05:00
Austin Seipp
a713251348 timescaledb: 0.11.0 -> 1.0.0 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2018-11-03 19:49:00 -05:00
Austin Seipp
cecee87f39 pg_repack: reindent to 2-spaces 
More or less all the Postgres code uses this, so it's nice to be
consistent.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2018-11-03 19:46:07 -05:00
Austin Seipp
b5be88c97a pg_hll: 2.10.2-9af41684 -> 2.12 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2018-11-03 19:44:24 -05:00
Austin Seipp
648f4a2769 nixpkgs: tidy up pgjwt package 
This makes pgjwt take a dummy 'postgresql' argument, which it does not *need*
in the buildInputs (it is purely a SQL extension with no C code). However, this
argument will be necessary for an upcoming change that will parameterize the
extensions over a particular PostgreSQL version.

It also does some tiny cleanup, setting a null build phase.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2018-11-02 13:52:48 -05:00
Austin Seipp
2266f2014b nixos/postgresql: add myself as maintainer 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2018-11-02 13:52:33 -05:00
Alyssa Ross
91c746cacc
postgresql_11: init at 11.0 2018-10-30 14:33:35 +00:00
Alyssa Ross
c6c7d55790
postgresql*: use underscores in version numbers 2018-10-30 14:32:21 +00:00
Alyssa Ross
9594b59f13
postgresql10: rename from postgresql100 2018-10-30 12:40:20 +00:00
R. RyanTM
5fd8de8137 pgroonga: 2.1.3 -> 2.1.6 (#49205) 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pgroonga/versions
 2018-10-27 20:14:23 -04:00
R. RyanTM
d9423ee446 mysql57: 5.7.23 -> 5.7.24 (#49221) 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mysql/versions
 2018-10-27 09:50:57 -04:00
R. RyanTM
d2a137abb5 pg_repack: 1.4.3 -> 1.4.4 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pg_repack/versions
 2018-10-24 15:22:43 +02:00
Frederik Rietdijk
89349fdae9 Merge staging-next into staging 2018-10-17 08:36:28 +02:00
florianjacob
98e5a0f9f4 mariadb.connector-c: 2.3.6 -> 2.3.7 (#48078) 2018-10-16 09:04:37 +02:00
Jörg Thalheim
7e5e9429d0
Merge pull request #48375 from r-ryantm/auto-update/pg_cron 
pg_cron: 1.0.2 -> 1.1.2
 2018-10-15 23:22:26 +01:00
Jörg Thalheim
af496bade8
Merge pull request #48474 from c0bw3b/pkg/pgjdbc 
postgresql-jdbc: 42.2.2 -> 42.2.5
 2018-10-15 22:51:21 +01:00
Renaud
ed6e251ff0
sqlite-jdbc: 3.20.0 -> 3.25.2 2018-10-15 20:45:50 +02:00
Renaud
adf9c5080f
postgresql-jdbc: 42.2.2 -> 42.2.5 
¤ set read-only permissions on .jar at install (mode 0444)
¤ license is now BSD 2-clause
 2018-10-15 19:34:24 +02:00
R. RyanTM
170c6104b6 pg_cron: 1.0.2 -> 1.1.2 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pg_cron/versions
 2018-10-13 21:36:56 -07:00
Yurii Izorkin
963dcd935d mariadb galera: 25.3.23 -> 25.3.24 (#47905) 2018-10-06 16:03:15 +02:00
R. RyanTM
d1b8d73464 pgroonga: 2.0.9 -> 2.1.3 (#46984) 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pgroonga/versions
 2018-09-29 20:54:42 +02:00
R. RyanTM
d57b9eb6d6 pgtap: 0.98.0 -> 0.99.0 (#46980) 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pgtap/versions
 2018-09-23 15:09:37 +02:00
R. RyanTM
9064d9db00 cstore_fdw: 1.6.1 -> 1.6.2 (#46291) 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/cstore_fdw/versions
 2018-09-18 18:26:08 +02:00
John Ericson
440ac01e5a
postgresql: Fix cross compilation 
b1548ce080 dropped the C compiler prefix
 2018-08-20 10:12:18 +02:00
Vladimír Čunát
153a19df05
Merge branch 'master' into staging-next 
Hydra: ?compare=1474536
 2018-08-20 09:15:33 +02:00
R. RyanTM
aacb2840d1 pgbouncer: 1.8.1 -> 1.9.0 (#45168) 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pgbouncer/versions.
 2018-08-19 22:47:48 +02:00
R. RyanTM
7fa8623d11 pgroonga: 2.0.6 -> 2.0.9 (#45167) 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pgroonga/versions.
 2018-08-19 22:47:22 +02:00
Vladimír Čunát
b1548ce080
postgresql*: fixup build by a side-step 
https://github.com/NixOS/nixpkgs/pull/44767#issuecomment-414066070
 2018-08-19 09:07:00 +02:00
Orivej Desh
65663f883c msgpack: rename from libmsgpack 
The project does not use the name "libmsgpack". It variously uses "msgpack" and
"msgpack-c", and "msgpackc" for the name of the library.
 2018-08-18 23:19:54 +00:00
Andreas Rammhold
5da1d01bf2
mariadb: 10.2.16 -> 10.2.17 (#45199) 
Bump to latest stable version of the 10.2.x branch. Besides many bug fixes the
following security related issues have been fixed:
 - CVE-2018-3060
 - CVE-2018-3064
 - CVE-2018-3063
 - CVE-2018-3058
 - CVE-2018-3066

Release notes: https://mariadb.com/kb/en/library/mariadb-10217-release-notes/
 2018-08-18 12:14:13 +02:00
Vladimír Čunát
c13bbda5b3
Merge #45146 into staging: postgresql security updates 2018-08-18 08:56:21 +02:00
Vladimír Čunát
cbabebcc2e
Merge branch 'master' into staging-next 
Hydra: ?compare=1473892
 2018-08-17 13:45:21 +02:00
Andreas Rammhold
5de601e0d2
postgresql93: 9.3.23 -> 9.3.24 
Fixes CVE-2018-10915 & CVE-2018-10925

Release notes: https://www.postgresql.org/docs/current/static/release-9-3-24.html
 2018-08-16 21:52:37 +02:00
Andreas Rammhold
2abb00e249
postgresql94: 9.4.18 -> 9.4.19 
Fixes CVE-2018-10915 & CVE-2018-10925

Release notes: https://www.postgresql.org/docs/current/static/release-9-4-19.html
 2018-08-16 21:52:37 +02:00
Andreas Rammhold
98d8db4c32
postgresql95: 9.5.13 -> 9.5.14 
Fixes CVE-2018-10915 & CVE-2018-10925

Release notes: https://www.postgresql.org/docs/current/static/release-9-5-14.html
 2018-08-16 21:52:30 +02:00
Andreas Rammhold
94c35894b0
postgresql96: 9.6.9 -> 9.6.10 
Fixes CVE-2018-10915 & CVE-2018-10925

Release notes: https://www.postgresql.org/docs/current/static/release-9-6-10.html
 2018-08-16 21:41:05 +02:00
Andreas Rammhold
1c4fc1dbd9
postgresql100: 10.4 -> 10.5 
Fixes CVE-2018-10915 & CVE-2018-10925

Release notes: https://www.postgresql.org/docs/current/static/release-10-5.html
 2018-08-16 21:38:29 +02:00
Timo Kaufmann
c0b9a7ec8b
Merge pull request #45132 from r-ryantm/auto-update/timescaledb 
timescaledb: 0.10.1 -> 0.11.0
 2018-08-16 20:54:29 +02:00
R. RyanTM
87db3da091 timescaledb: 0.10.1 -> 0.11.0 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/timescaledb/versions.
 2018-08-16 11:35:39 -07:00
Christoph Hrdinka
72a35533e0 postgresql: fix tzdata path 
Signed-off-by: Christoph Hrdinka <c.github@hrdinka.at>
 2018-08-14 19:07:32 +01:00
Vladimír Čunát
5b0398dc36
Merge branch 'master' into staging-next 
Conflicts: gobby and libinfinity - I took the hand-edited versions
instead of those resuting from the mass-replacement.

Hydra: ?compare=1473190
 2018-08-13 20:43:59 +02:00
R. RyanTM
e0eb7d9ed7 cstore_fdw: 1.6.0 -> 1.6.1 (#44792) 
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cstore_fdw/versions.
 2018-08-13 14:35:53 +02:00
Vladimír Čunát
00df25ee57
Merge branch 'master' into staging-next 
Hydra: ?compare=1472947
 2018-08-12 10:33:41 +02:00
R. RyanTM
bbfed77bec mysql57: 5.7.22 -> 5.7.23 (#44740) 
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mysql/versions.
 2018-08-09 21:51:16 +02:00
Frederik Rietdijk
d9fa74ba78 Merge master into staging 2018-08-09 18:28:15 +02:00
Cray Elliott
4c45016c29 Revert "mariadb: 10.2.16 -> 10.3.8" 
This reverts commit 00ab5c5b6a.

The commit listed broke darwin and held up Hydra. sorry about that!
 2018-08-05 20:12:18 -07:00
Tuomas Tynkkynen
008fd5fcf5 Merge remote-tracking branch 'upstream/master' into staging 2018-08-04 15:17:42 +03:00
John Ericson
db965063b3 treewide: Make configureFlags lists 2018-08-03 17:06:03 -04:00
John Ericson
ebbd6f3471
Merge pull request #44083 from dingxiangfei2009/cross-compiling-postgresql 
Allow postgresql to cross compile
 2018-08-03 14:44:55 -04:00
John Ericson
f539c30095 postgresql: Fix nits after cross fixes 2018-08-02 18:48:06 -04:00
Cray Elliott
00ab5c5b6a mariadb: 10.2.16 -> 10.3.8 2018-08-01 20:57:08 -07:00
Ding Xiang Fei
003055a670 pass NIX_CFLAGS_COMPILE through mkDerivation instead 2018-07-31 11:23:17 +08:00
Ding Xiang Fei
c0ca3e36d6 be explicit on choice of uuid library 2018-07-30 15:47:10 +08:00
Ding Xiang Fei
e8682cafd6 always build against tzdata 2018-07-30 11:54:57 +08:00
Ding Xiang Fei
894705161c use NIX_CFLAGS_COMPILE 2018-07-29 21:21:46 +08:00
Ding Xiang Fei
a998a49ee4 reduce diffs due to reordering 2018-07-27 14:19:05 +08:00
Ding Xiang Fei
b2104d93ff point to the right libxml2 header folder 2018-07-27 14:12:25 +08:00
Ding Xiang Fei
5c7cfbc0f1 allow postgresql cross compiling 2018-07-25 16:32:42 +08:00
Jörg Thalheim
218298b30f
Merge branch 'master' into unused5 2018-07-21 15:41:22 +01:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
volth
dda95bae35 [bot] treewide: remove unused 'args@' in lambdas 2018-07-20 19:54:05 +00:00
Silvan Mosberger
446ec6df2d postgresql100: 10.3 -> 10.4 
Fixes CVE-2018-1115

Release notes: https://www.postgresql.org/docs/10/static/release-10-4.html
 2018-07-20 11:50:41 -05:00
Silvan Mosberger
d066cecd7d postgresql96: 9.6.8 -> 9.6.9 
Fixes CVE-2018-1115

Release notes: https://www.postgresql.org/docs/10/static/release-9-6-9.html
 2018-07-20 11:50:41 -05:00
Silvan Mosberger
ac5fdda5a6 postgresql95: 9.5.12 -> 9.5.13 
Release notes: https://www.postgresql.org/docs/10/static/release-9-5-13.html
 2018-07-20 11:50:41 -05:00
Silvan Mosberger
3d16732102 postgresql94: 9.4.17 -> 9.4.18 
Release notes: https://www.postgresql.org/docs/10/static/release-9-4-18.html
 2018-07-20 11:50:41 -05:00
Silvan Mosberger
73aaf63fb1 postgresql93: 9.3.22 -> 9.3.23 
Release notes: https://www.postgresql.org/docs/10/static/release-9-3-23.html
 2018-07-20 11:50:41 -05:00
Izorkin
7307c35f30 mariadb: 10.2.15 -> 10.2.16 2018-07-16 03:53:32 +00:00
Austin Seipp
6a1b65b606 timescaledb: 0.9.2 -> 0.10.1 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2018-07-14 12:53:36 -05:00
Austin Seipp
8f21a16861 timescaledb: create $out/bin in order to work around a stupid bug 
See #22653 or #38469. 'manveru' reported this on IRC again, but unfortunately a
real fix requires a bit more work. In the mean time, this plugs the leak with a
bit of duct tape.

'timescale' is an often desired extension and, in the mean time, this
workaround means you also do not have to install something like postgis (with a
large dependency set) into your closure to get things to work.

Ideally in the mean time, *all* postgresql extensions should have $out/bin
created for them... Doing this will require more ongoing work, or a proper
fix to the buildEnv nonsense going on.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2018-07-14 12:50:20 -05:00
Silvan Mosberger
57bccb3cb8 treewide: http -> https sources (#42676) 
* treewide: http -> https sources

This updates the source urls of all top-level packages from http to
https where possible.

* buildtorrent: fix url and tab -> spaces
 2018-06-28 20:43:35 +02:00
Ryan Mulligan
fce8f26af6 treewide: http -> https (#42665) 2018-06-27 22:12:57 +02:00
Benjamin Hipple
3bb305515f mariadb: provide multiple src url mirrors 
Both mariadb.com and mariadb.org appear to be canonical upstream sources, and
have identical sha256 hashes at these URLs.

For the third-party mirrors, if we are just going to provide one URL, it should
be an HTTPS url instead of FTP or SSH, which many users may not be able to
access due to network security configurations.
 2018-06-24 19:03:18 +00:00
Frederik Rietdijk
404f91c4c2 Merge master into staging 2018-06-21 07:42:14 +02:00
Florian Engel
1748313f30 monetdb: 11.29.3 -> 11.29.7 2018-06-20 21:40:15 +02:00
Vladimír Čunát
31530c185e
Merge a subset of staging (security) 
In particular, this contains Firefox-related and libgcrypt updates.
Other larger rebuilds would apparently need lots of time to catch up
on Hydra, due to nontrivial rebuilds in other branches than staging.
 2018-06-15 08:48:02 +02:00
Orivej Desh
7f3de60758 Merge branch 'master' into staging 
* master: (161 commits)
  pcsclite: clean up after #41790
  tor: 0.3.3.6 -> 0.3.3.7
  opae: init at 1.0.0
  tinc: 1.0.33 -> 10.0.34
  tinc_pre: 1.1pre15 -> 1.1pre16
  sit: 0.3.2 -> 0.4.0 (#41863)
  platforms/raspberrypi: enable kernelAutoModules
  libupnp: 1.6.21 -> 1.8.3 (#41684)
  androidStudioPackages.{dev,canary}: 3.2.0.16 -> 3.2.0.17
  tdesktop: 1.3.0 -> 1.3.7
  gns3Packages.{server,gui}{Stable,Preview}: 2.1.6 -> 2.1.7
  aws-sam-cli: init at 0.3.0 (#41877)
  nixos/nat: optional networking.nat.externalInterface (#41864)
  linux: 4.17 -> 4.17.1
  linux: 4.16.14 -> 4.16.15
  linux: 4.14.48 -> 4.14.49
  nixos/unbound: add restart (#41885)
  maintainers/create-azure.sh: remove hydra.nixos.org as binary cache (#41883)
  gshogi: init at 0.5.1 (#41840)
  neovim: add missing libiconv
  ...
 2018-06-12 20:41:41 +00:00
Izorkin
1705428cf9 mariadb galera: fix build (#41813) 2018-06-11 20:42:53 +02:00
Michael Raskin
b4c38a5174 mariadb: galera: there is no galera_new_cluster 2018-06-11 20:06:27 +02:00
Michael Raskin
d871acb3b2
Merge pull request #33176 from Izorkin/mariadb-galera 
mariadb galera: init at 25.3.23
 2018-06-10 21:23:11 +00:00
Izorkin
9ed1a66ab2 mariadb.connector-c: 2.3.5 -> 2.3.6 2018-06-10 15:24:27 +03:00
Daiderd Jordan
fcdcfe2de1
Merge branch 'master' into staging 2018-06-08 18:06:47 +02:00
Izorkin
13705c02ce mariadb: 10.2.14 -> 10.2.15 (#41497) 2018-06-06 22:19:57 +02:00
Orivej Desh
859e27f177 mysql57: unbundle libedit, libevent, lz4, protobuf, zlib 2018-06-04 05:22:25 +00:00
Orivej Desh
303a17a939 mysql57: 5.7.20 -> 5.7.22 
Do not SKIP_BUILD_RPATH to let libmysql_api_test run during the build.

There is no WITH_UNITTEST, but there is WITH_UNIT_TESTS.

Do not install and immediately delete mysql-test.

There is no "basedir=" in mysql_install_db.
 2018-05-29 13:41:23 +00:00
Orivej Desh
4b975f0fb9 mysql55: 5.5.58 -> 5.5.60 
mysql-test-run.pl.1 no longer exists.

Do not install and immediately delete mysql-test and sql-bench.
 2018-05-29 13:41:23 +00:00
John Ericson
18742471af Merge remote-tracking branch 'upstream/master' into staging 
Use newer vagrant from master
 2018-05-23 09:40:37 -04:00
R. RyanTM
62f0d64640 pg_repack: 1.4.2 -> 1.4.3 
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/pg_repack/versions.

These checks were done:

- built on NixOS
- /nix/store/08l7mgizcwhz3iiq7q53529mnj0z9apl-pg_repack-1.4.3/bin/pg_repack passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 1 of 1 passed binary check by having the new version present in output.
- found 1.4.3 with grep in /nix/store/08l7mgizcwhz3iiq7q53529mnj0z9apl-pg_repack-1.4.3
- directory tree listing: https://gist.github.com/98848a9a560aa1d4de3e164197944d32
- du listing: https://gist.github.com/cfef5141050a394c88b04b839ec17fdf
 2018-05-22 21:06:52 -07:00
Vladimír Čunát
392e6de7d0
Merge branch 'master' into staging 2018-05-20 13:20:53 +02:00
R. RyanTM
2af45d94dd pgroonga: 2.0.5 -> 2.0.6 (#40646) 
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/pgroonga/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 2.0.6 with grep in /nix/store/nh4mqn37kx82q7l5fm6anycaw8iz7b8n-pgroonga-2.0.6
- directory tree listing: https://gist.github.com/14e8971d0a27517ef320553ce1e8d33c
- du listing: https://gist.github.com/c1f25e2851a59216d5fa9f88b6477927
 2018-05-19 16:59:54 +02:00
Izorkin
789c0614f0 mariadb galera: init at 25.3.23 2018-05-18 20:16:00 +03:00
John Ericson
ddbe9191ef Merge remote-tracking branch 'upstream/master' into staging 
Keep the dontCheck because the test suite fails, get rid of the LDFLAGS
hack because we don't need it!
 2018-05-16 15:16:08 -04:00
R. RyanTM
e03acfe161 timescaledb: 0.9.1 -> 0.9.2 (#40468) 
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/timescaledb/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.9.2 with grep in /nix/store/m28fll152hk6ik9fiz2jy66qccjxklq3-timescaledb-0.9.2
- directory tree listing: https://gist.github.com/a922008862652d9f3c6f2e2a678c4c71
- du listing: https://gist.github.com/8c5a0a1374fbb013168d4197d67ba214
 2018-05-16 14:47:29 +02:00
John Ericson
2c5d915200 Merge commit '92b7a814f26ee1d37e989431c18518c67285a332' into staging 2018-05-13 01:02:09 -04:00