Merge pull request #250 from technion/jiffy_update

Update Jiffy, as the previous version does not compile on GCC 5.1.0
inaka · Aug 9, 2015 · b389b3e · b389b3e
2 parents 9c5bc00 + c756fd6
commit b389b3e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ dep_lager = git git://github.com/basho/lager.git 2.0.3
 dep_sync = git git://github.com/inaka/sync.git 0.1.3
 dep_getopt = git git://github.com/jcomellas/getopt v0.8.2
 dep_meck = git git://github.com/eproxus/meck 0.8.2
-dep_jiffy = git git://github.com/davisp/jiffy 0.11.3
+dep_jiffy = git git://github.com/davisp/jiffy 0.14.2
 dep_ibrowse = git git://github.com/cmullaparthi/ibrowse v4.1.1
 dep_aleppo = git git://github.com/inaka/aleppo 0.9.1
 dep_zipper = git git://github.com/inaka/zipper 0.1.2

diff --git a/rebar.config b/rebar.config
@@ -24,7 +24,7 @@
   {lager,   "2.*", {git, "git://github.com/basho/lager.git",          "2.0.0"}},
   {getopt,  "0.*", {git, "git://github.com/jcomellas/getopt.git",     "v0.8.2"}},
   {meck,    "0.*", {git, "git://github.com/eproxus/meck.git",         "0.8.2"}},
-  {jiffy,   "0.*", {git, "git://github.com/davisp/jiffy.git",         "0.11.3"}},
+  {jiffy,   "0.*", {git, "git://github.com/davisp/jiffy.git",         "0.14.2"}},
   {ibrowse, "4.*", {git, "git://github.com/cmullaparthi/ibrowse.git", "v4.1.1"}},
   {aleppo,  "0.*", {git, "git://github.com/inaka/aleppo.git",         "0.9.0"}},
   {zipper,  ".*",  {git, "git://github.com/inaka/zipper.git",         "0.1.0"}},