Commit Graph

  • 9b824c3aad pipelined transaction response fix : indentation fix Himanshu Verma 2014-09-01 11:12:26 +05:30
  • b219345761 pipelined transaction response fix Himanshu Verma 2014-08-31 16:06:33 +05:30
  • ebaba79119 Merge branch 'markus-s24-double-weights' Jungtaek Lim 2014-08-30 21:03:39 +09:00
  • 582d00b5ca Merge branch 'double-weights' of https://github.com/markus-s24/jedis into markus-s24-double-weights Jungtaek Lim 2014-08-30 21:03:37 +09:00
  • d3d5d476e3 Merge branch 'markust push origin master-s24-master' Jungtaek Lim 2014-08-29 14:20:08 +09:00
  • f6aced860a Merge branch 'master' of https://github.com/markus-s24/jedis into markus-s24-master Jungtaek Lim 2014-08-29 14:19:41 +09:00
  • db6d8c0daf Merge branch 'HeartSaVioR-present-close-to-jedis-cluster' Jungtaek Lim 2014-08-29 11:30:12 +09:00
  • babedd5be0 Merge branch 'present-close-to-jedis-cluster' of https://github.com/HeartSaVioR/jedis into HeartSaVioR-present-close-to-jedis-cluster Jungtaek Lim 2014-08-29 11:30:04 +09:00
  • 3a3b73fca8 Merge pull request #718 from HeartSaVioR/pubsub-numsub-output-changed Marcos Nils 2014-08-28 20:46:06 -03:00
  • 0a094ff0b4 Implements #701, add close() to JedisCluster Jungtaek Lim 2014-08-28 23:49:52 +09:00
  • 431ae79ff1 Follow up changes on "pubsub numsub" output Jungtaek Lim 2014-08-28 18:14:49 +09:00
  • 419f0c7d17 Merge branch '50onRed-fix-hgetall' Jungtaek Lim 2014-08-28 09:38:09 +09:00
  • 2eda9cd8fb Removed deprecated int based weights Markus Heiden 2014-08-27 21:41:22 +02:00
  • ad5412d8cf Restored old method for int weights for backwards compatibility Markus Heiden 2014-08-27 21:12:28 +02:00
  • 9f4faf53ff fix binary version of hgetAll(), fixes #711 Ivan Dyedov 2014-08-26 11:50:56 -04:00
  • ae73a99a17 Adopted test to use decimal weight values Markus Heiden 2014-08-23 19:39:19 +02:00
  • 52ac566dd3 Changed weights from ints to doubles Markus Heiden 2014-08-23 18:14:50 +02:00
  • a30598b7cb add blpop/brpop with timeout parameter interface to JedisCommands Ming 2014-08-14 10:37:28 +08:00
  • c62672e3a0 add timeout parameter to blpop/brpop Ming 2014-08-13 14:44:17 +08:00
  • c42965dcd5 Merge branch 'pipeline-and-transaction-can-handle-responses-on-their-own-status' of https://github.com/HeartSaVioR/jedis into HeartSaVioR-pipeline-and-transaction-can-handle-responses-on-their-own-status Jungtaek Lim 2014-08-13 07:18:48 +09:00
  • 68a56938c1 Merge branch 'pipeline_getrange_fix' of https://github.com/UglyTroLL/jedis into UglyTroLL-pipeline_getrange_fix Jungtaek Lim 2014-08-12 10:16:31 +09:00
  • e6d08f46fb Merge branch 'remove-pexpire-int' of https://github.com/aniketschneider/jedis into aniketschneider-remove-pexpire-int Jungtaek Lim 2014-08-12 10:12:44 +09:00
  • 5bf4a697fb Merge branch 'unsigned_long_cursor_remove_deprecated' of https://github.com/HeartSaVioR/jedis into HeartSaVioR-unsigned_long_cursor_remove_deprecated Jungtaek Lim 2014-08-12 10:07:26 +09:00
  • 26d1f4ad90 Merge branch 'support-cluster-slots' of https://github.com/HeartSaVioR/jedis into HeartSaVioR-support-cluster-slots Jungtaek Lim 2014-08-12 09:48:53 +09:00
  • 1e94acd7da Merge branch 'fix/complete-interface' of https://github.com/lstrojny/jedis into lstrojny-fix/complete-interface Jungtaek Lim 2014-08-12 09:40:45 +09:00
  • 514144d472 Fix indentation (code formatting...) Jungtaek Lim 2014-08-08 10:56:39 +09:00
  • 1877185153 Merge branch 'master' into pipeline-and-transaction-can-handle-responses-on-their-own-status Jungtaek Lim 2014-08-08 10:46:43 +09:00
  • 2d93fa0e2b version bump Jonathan Leibiusky 2014-08-04 11:20:52 -04:00
  • 03c0af2581 Merge pull request #685 from HeartSaVioR/master Jungtaek Lim 2014-08-04 09:40:20 +09:00
  • d7cd3a0af6 Fixed critical JedisCluster bug : hlen calls hdel Jungtaek Lim 2014-08-04 09:28:17 +09:00
  • 056e6e9db2 Do master failover detection in JedisSentielPool.getResource Nelson Rodrigues 2014-08-02 14:34:06 -07:00
  • dddc0d15f1 Add second jedis connection to waitForNewPromotedMaster call Nelson Rodrigues 2014-07-28 11:51:41 -07:00
  • c81bdc0849 Properly close jedis connection in case of exceptions Nelson Rodrigues 2014-07-28 11:45:34 -07:00
  • d52cc06b72 Let the user choose whether to testOnBorrow or testOnReturn Nelson Rodrigues 2014-07-28 11:44:23 -07:00
  • fceb719848 Proper master failover detection depends on testOnBorrow Nelson Rodrigues 2014-07-28 11:35:39 -07:00
  • c02c663776 Add check that JedisSentinelPool accepts closing connections before and after failover Nelson Rodrigues 2014-07-28 11:34:00 -07:00
  • 9013078d40 Fix race condition in JedisSentinelPoolTest Nelson Rodrigues 2014-07-28 10:56:21 -07:00
  • 9e128b4520 Add an extra sentinel server to tests Nelson Rodrigues 2014-07-28 10:55:09 -07:00
  • 75d2ba751b Race condition when switching masters in JedisSentinelPool Nelson Rodrigues 2014-07-25 18:06:33 -07:00
  • 4f693872b9 Merge pull request #677 from macgngsta/master Jungtaek Lim 2014-07-18 12:53:01 +09:00
  • c2624c6c93 fixed the name of archiveBaseName to archivesBaseName Greg Tam 2014-07-17 15:11:02 -06:00
  • e67a80f694 Merge pull request #675 from evenX86/patch-1 Jungtaek Lim 2014-07-17 19:10:13 +09:00
  • 088d86a60f Update Jedis.java xuyifei 2014-07-17 16:40:22 +08:00
  • 15ab934945 Re-format source to respect Jedis convention Jungtaek Lim 2014-07-02 23:52:42 +09:00
  • 4b72a4d254 Replace synchronized keyword lock to ReaderWriterLock Jungtaek Lim 2014-07-02 23:46:15 +09:00
  • 94966e6163 Renew slots when MOVED occured during request to Cluster Jungtaek Lim 2014-07-02 23:29:30 +09:00
  • b7b10df0a1 Merge branch 'master' into renew-slots-info-when-moved-has-occurred Jungtaek Lim 2014-07-02 23:21:58 +09:00
  • 76df52ef9d Merge pull request #668 from HeartSaVioR/fix-build-related-to-change-of-cluster-nodes-output Jungtaek Lim 2014-07-02 08:01:51 +09:00
  • 0f472c97a2 fix build after CLUSTER NODES output has been changed Jungtaek Lim 2014-07-02 07:42:29 +09:00
  • fd23f8b8f7 Support CLUSTER SLOTS command Jungtaek Lim 2014-07-02 06:46:58 +09:00
  • 18c4a987d5 Completing interface Lars Strojny 2014-07-01 15:10:07 +02:00
  • 4c4446a71f Remove unused (by accident?) import Jungtaek Lim 2014-06-24 09:23:19 +09:00
  • 1d29b759fe Make it better to use URI from Jedis / JedisPool Jungtaek Lim 2014-06-15 21:50:38 +09:00
  • 19fc1f87cf Merge remote-tracking branch 'upstream/master' Mayank Dang 2014-05-30 16:16:23 +05:30
  • e05eaa2b07 [maven-release-plugin] prepare for next development iteration Jonathan Leibiusky 2014-05-29 11:44:57 -04:00
  • fdce5fb692 [maven-release-plugin] prepare release jedis-2.5.1 Jonathan Leibiusky 2014-05-29 11:44:56 -04:00
  • d02e56c4f8 Merge pull request #651 from xetorthio/protocol_bound_fix Jonathan Leibiusky 2014-05-29 11:43:16 -04:00
  • 334d2ec19b Added test case for testing if PoolConfig applies to ClusterPools Mayank Dang 2014-05-29 20:50:23 +05:30
  • 0e25cf65fb Merging upstream Mayank Dang 2014-05-29 20:44:40 +05:30
  • 74b527d629 Merge pull request #648 from dustinlineweber/patch-1 Jungtaek Lim 2014-05-28 05:48:10 +09:00
  • 58ebeed00e Update README.md Dustin Lineweber 2014-05-27 15:37:42 -05:00
  • 7e8b09e610 [maven-release-plugin] prepare for next development iteration Jonathan Leibiusky 2014-05-27 12:50:25 -04:00
  • 9aab05f9d0 [maven-release-plugin] prepare release jedis-2.5.0 Jonathan Leibiusky 2014-05-27 12:50:23 -04:00
  • 6f8d46ae4f Merge branch 'master' into implements-closeable-to-pooled-jedis-shardedjedis Jungtaek Lim 2014-05-26 11:18:45 +09:00
  • 0a8aa7ae1d Merge pull request #606 from HeartSaVioR/append-package-command-in-makefile Marcos Nils 2014-05-25 23:05:39 +03:00
  • 667eeaf815 Merge pull request #626 from HeartSaVioR/fix-pipeline-throws-npe-without-multi Marcos Nils 2014-05-25 22:52:41 +03:00
  • 1fba7de9bc Change back commons pool to 2.0 as 2.2 isn't fully tested Marcos Nils 2014-05-25 16:51:47 -03:00
  • 4ca3596df1 Merge branch 'PumpkinJack-master' Marcos Nils 2014-05-25 16:44:45 -03:00
  • f3834e1a1b Merge branch 'master' of https://github.com/PumpkinJack/jedis into PumpkinJack-master Marcos Nils 2014-05-25 16:43:33 -03:00
  • e0cf204fc4 Merge branch 'HeartSaVioR-introduce-undocumented-jedis-cluster-commands' Marcos Nils 2014-05-25 16:31:00 -03:00
  • 1782aaeeb1 Manual merge of #581 Marcos Nils 2014-05-25 16:30:41 -03:00
  • d8c3629fde Merge branch 'etreworgy-impl-incrbyfloat' Marcos Nils 2014-05-25 15:32:45 -03:00
  • 50052e90ad Manually merge #400 Marcos Nils 2014-05-25 15:32:12 -03:00
  • 0d5062c347 Merge branch 'master' of github.com:xetorthio/jedis Marcos Nils 2014-05-25 15:23:59 -03:00
  • a21d1fae37 Merge branch 'HeartSaVioR-expose-scan-commands-to-binary-jedis' Marcos Nils 2014-05-25 15:22:38 -03:00
  • 3131279b5b Manually merge with #574 Marcos Nils 2014-05-25 15:22:20 -03:00
  • 213d186c8d Merge pull request #576 from aniketschneider/pexpire-long-with-deprecation Marcos Nils 2014-05-25 21:12:33 +03:00
  • 6106f5bbe6 Manually merge #578 to master Marcos Nils 2014-05-25 15:01:24 -03:00
  • bc9e49d6c9 Merge pull request #571 from rherget/master Jonathan Leibiusky 2014-05-25 13:36:27 -04:00
  • 20d1450124 Merge pull request #622 from mindwind/master Marcos Nils 2014-05-25 20:34:30 +03:00
  • 8f52dc743f Merge pull request #615 from xetorthio/hll-resurrect-afefb71e57b0258a52b465b2b4e57c132aef4db9 Jonathan Leibiusky 2014-05-25 13:34:13 -04:00
  • c17a228b45 Merge pull request #637 from HeartSaVioR/fix-cluster-nodes-parse-error Marcos Nils 2014-05-25 20:32:28 +03:00
  • aca1b32f6e Merge pull request #641 from Lolecule/set_nxxx_expx_on_jedis_cluster Jonathan Leibiusky 2014-05-25 13:31:36 -04:00
  • ab2f43b8c0 fix issue #642 wjw 2014-05-23 16:18:07 +08:00
  • 268706b65c format test code wjw 2014-05-23 15:39:51 +08:00
  • 3917a50c03 format code use STS wjw 2014-05-23 15:04:52 +08:00
  • 742e83b1e0 Added override annotation to ShardedJedis.set() Steve Parrington 2014-05-22 11:29:55 +01:00
  • 51de5f72ab Added Set NXXX and EXPX options for JedisCluster and ShardedJedis Steve Parrington 2014-05-21 16:09:47 +01:00
  • 7255a8cae1 fix "cluster nodes" parse error when slot is in transition Jungtaek Lim 2014-05-21 08:08:12 +09:00
  • 4b07966e74 Checks for buffer out of bounds before writing to the stream. Fixes #636 Marcos Nils 2014-05-20 11:42:16 -03:00
  • 942fc1d77b add the time() method PumpkinJack 2014-05-04 15:15:21 +08:00
  • e17a312d92 To solving the error (at Pool.java 35 : The type org.apache.commons.pool2.impl.AbandonedConfig cannot be resolved. It is indirectly referenced from required .class files), we update common-pool2 (2.0 -> 2.2) PumpkinJack 2014-05-04 15:03:18 +08:00
  • c63e901232 add 'time()' method to MultiKeyPipellineBase PumpkinJack 2014-05-03 17:25:10 +08:00
  • 6485a7ec08 Add Binary Pipeline version of pfcount Jungtaek Lim 2014-04-30 08:17:59 +09:00
  • 219f9b3716 Merge pull request #627 from aloksingh/hll-pfcount-with-multiple-keys Jungtaek Lim 2014-04-30 06:54:22 +09:00
  • d9d039d060 Added pfcount(keys) to BinaryJedis interfaces Alok Singh 2014-04-29 08:58:15 -07:00
  • b633024c11 Move pfcount(keys) method to multikey interfaces Alok Singh 2014-04-28 16:41:09 -07:00
  • cd722e5a82 Add support for pfcount with multiple keys Alok Singh 2014-04-28 14:17:46 -07:00
  • bbc9078c3f Fix Pipeline NPE or sth with multi Jungtaek Lim 2014-04-29 00:05:49 +09:00
  • 69de8d84d5 fix - ScanParams should be return this reference mindwind 2014-04-24 10:58:57 +08:00