Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: jcorwin/zookeeper-client
base: master
...
head fork: twitter-archive/scala-zookeeper-client
compare: master
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Jun 30, 2011
@ryanking ryanking upgrade a bunch of dependencies
standard-project 0.7.5 -> 0.12.7
scala 2.7->2.8 (this obviously caused some other changes)
specs 1.6.2.1 -> 1.6.5
log4j 1.2.15 -> 1.2.16
ostrich 1.1.6 -> 4.4.0

Also moved away from Configgy to our new-style config
ab23abe
@ryanking ryanking 2.0.0 d20def3
@ryanking ryanking Merge branch 'master' into deps_upgrade
Conflicts:
	project/build.properties
	project/build/ZookeeperClientProject.scala
	project/plugins/Plugins.scala
	project/plugins/project/build.properties
	src/main/scala/com/twitter/zookeeper/ZooKeeperClient.scala
	src/test/scala/com/twitter/zookeeper/ZooKeeperClientSpec.scala
fb66bc5
@ryanking ryanking remove debugging println 4773594
@ryanking ryanking 3.0.0 314d523
@ryanking ryanking add constructor that just takes a config object a8e67b8
Commits on Jul 06, 2011
@ryanking ryanking let apps pick their logging stuff b780917
@ryanking ryanking update based on review 095a156
@ryanking ryanking Merge branch 'deps_upgrade' 7961570
@ryanking ryanking update publish repository 39b320b
Commits on Jul 29, 2011
Ryan King use maven for zookeeper jar 1b0307e
Ryan King update ostrich dep c0ba49f
Ryan King 3.0.1 0a75af1
Ryan King org=com.twitter,name=zookeeper-client,version=3.0.1 1db8aaf
Ryan King org=com.twitter,name=zookeeper-client,version=3.0.2-SNAPSHOT 9d57811
Commits on Aug 19, 2011
@evnm evnm Fix indentation in README code example. e0397a7
Commits on Aug 22, 2011
@ryanking ryanking Merge pull request #2 from evnm/readme-indentation
Fix indentation in README code example
648b76c
Commits on Oct 10, 2011
Ryan King Merge branch 'master' of github.com:twitter/scala-zookeeper-client 375f6c6
Commits on Oct 28, 2011
Ryan King some simple dependency updates 4792ab9
Commits on Oct 31, 2011
Ryan King [split] update build setup for scala-zookeeper-client d35e68f
Commits on Nov 01, 2011
@dhelder dhelder [split] Fix macaw-search tests 5adccbe
Commits on Nov 02, 2011
Ryan King [split] do not ci the zk client a9b7275
Commits on Nov 04, 2011
@bierbaum bierbaum [split] make native provider bootstrapping code work; refactor 'Ssl' …
…singleton
bc6803d
Commits on Nov 09, 2011
@mariusae mariusae [split] projects: update to new SVN repo URLs 605eb24
Commits on Nov 14, 2011
Ryan King [split] refactoring snowflake configs to make it easier for release t…
…o deploy to smfd Mostly just yak-factoring to make configs easier to manage (and be more validated).

- another config refactor
- refactor to put the worker ids in the config file
- validate configs in snowflake-twitter
- validate snowflake configs when testing
- comment out this test that requires a server. let us find a better way to test this
- take zookeeper out of libs
- switch scala-zookeeper-config to a project dependency
1557910
Commits on Nov 18, 2011
@dhelder dhelder [split] Birdherd misc operationalizing
birdherd/ServiceTwitterConfig.scala:
  gizmoduck and tweetypie notes and secrets now required

woodstar/WoodstarServerConfig.scala:
  Use IntegrationTwitterConfig
birdherd/IntegrationTwitterConfig.scala:
  Add.  Uses prod gizmoduck, staging tweetypie, prod timeline service

birdherd/ProductionTwitterConfig.scala:
 Lower retries to 2, connection limit to 5

birdherd/TestStatus.scala, TestStatusView.scala:
  Add status 'views' for testing
08a4054
Commits on Dec 02, 2011
Kyle Maxwell [split] brittspace ea6f61d
Commits on Dec 07, 2011
Ryan King [split] org=com.twitter,name=scala-zookeeper-client,version=3.0.2 5b60b7c
Ryan King [split] org=com.twitter,name=scala-zookeeper-client,version=3.0.3-SNA…
…PSHOT
e67844a
Commits on Dec 14, 2011
Ryan King [split] update hosebird host list for budgie b1da5ab
Commits on Jan 11, 2012
Ryan King [split] update build properties cdd5844
Commits on Jan 18, 2012
Matthew Bilotti [split] Squashed commit of the following:
commit 38d83431735bd542ff20fd80ac40dd2035fd25cd
Merge: 1433984 ad396f5
Author: Matthew Bilotti <mbilotti@twitter.com>
Date:   Tue Jan 17 16:23:53 2012 -0800

    Merge branch 'master' of https://git.twitter.biz/birdcage into cassie_serversets_add_constructor

commit 1433984ea1524452eee161d6013496042aba6b9b
Author: Matthew Bilotti <mbilotti@twitter.com>
Date:   Tue Jan 17 15:03:57 2012 -0800

    add a ServerSetsCluster constructor that accepts a ZooKeeperClient instance
cae399c
Commits on Jan 24, 2012
@mariusae mariusae [split] versions f06d2b9
Commits on Feb 06, 2012
@dhelder dhelder [split] Cherry-pick from spullara's woodstar_perf: https://reviewboar…
…d.twitter.biz/r/52139/

    adjust host connections and memory parameters based on feedback
    enabled gzip compression in woodstar configurations
    cache the xml factory
    wrap the filehandler in a queue
    we were encurring huge waiters on the pool based on gizmoduck performance. based on this performance, 15 should give us the headroom required.
5fdb487
Commits on Feb 18, 2012
Ryan King [split] update versions af88bf0
Commits on Feb 23, 2012
Steve Jenson [split] - expose more finagle in our RequestConfig 077e8df
Commits on Feb 24, 2012
Ryan King [split] fix twitter/snowflake#6 23bb6fb
Commits on Mar 01, 2012
Ryan King [split] keep track of ids generated by user-agent e8ab87f
Commits on Mar 16, 2012
Ryan King [split] add 2 new snowflake hosts 65bd172
Commits on Mar 21, 2012
Ryan King [split] setup for snowflake in atla 632ad37
Commits on Mar 22, 2012
Ryan King [split] make scala-zookeeper-client float on the latest ostrich 496d0c4
Ryan King [split] updated versions.properties be932e8
Ryan King [split] explicit dependencies 927e3fa
@dhelder dhelder [split] Update to standard-project 1.0.4 9da6883
Commits on Mar 26, 2012
Glen D Sanford [split] servo: add stats collection and back off to optimistinc locki…
…ng cache Servo: - OptimisticLockingCache now takes a Stream[Duration] for backoffs, rather than maxTries, and reports lockAndSet count and duration, and exposes counters for failed attempts and exceptions - Add OptimisticLockingCacheFactoryConfig for configuring locking cache factories - Deprecated OptimisticLockingCacheFactory.apply()

 Gizmoduck:
 - update to use OptimisticLockingCacheFactoryConfig, add 1ms delay to lockAndSet attempts
60be1f3
Commits on Mar 29, 2012
@trustin trustin [split] Remove auto-generated build.properties b1ffb70
Commits on Mar 30, 2012
mmcbride [split] TO MAVEN 69ca99f
Commits on Apr 03, 2012
mmcbride [split] adding more projects to maven build f068e8e
mmcbride [split] fixing teether build, regen poms 5d4ed6a
@jjmmcc jjmmcc [split] updated versions.properties 497aa9c
Commits on Apr 04, 2012
@kmonkeyjam kmonkeyjam [split] add some ibis test client stuff to maven b22a256
Ryan King [split] updated vesion 6c947fb
Ryan King [split] org=com.twitter,name=scala-zookeeper-client,version=3.0.3 719ca13
Ryan King [split] org=com.twitter,name=scala-zookeeper-client,version=3.0.4-SNA…
…PSHOT
de407ef
Ryan King [split] org=com.twitter,name=scala-zookeeper-client,version=3.0.4 f879128
Ryan King [split] org=com.twitter,name=scala-zookeeper-client,version=3.0.5-SNA…
…PSHOT
116d029
mmcbride [split] first stab at dependency management 178fe9d
Commits on Apr 07, 2012
mmcbride [split] regenning poms 8b4e80d
Commits on Apr 09, 2012
mmcbride [split] adding maven plugins to birdcage, regenning poms 5f148e6
Commits on Apr 10, 2012
@jjmmcc jjmmcc [split] rm (budgie|scala-zookeeper-client)/project/plugins/project/bu…
…ild.properties These files are in our .gitignore files, but somehow got checked in anyway. This causes constant conflicts for people as these files are auto-generated by sbt.
051c0dc
Commits on May 01, 2012
mmcbride [split] baby steps on converting dependency managemnet solution 60ab9d6
Commits on May 03, 2012
mmcbride [split] getting rid of dependency management, go to explicit versions…
… + maven-tools/maven-release
7496ad6
mmcbride [split] bump to latest plugin versions ec38bef
mmcbride [split] update util versions 527400a
Commits on May 08, 2012
@mariusae mariusae [split] release 4.0.0 of util db8396a
@mariusae mariusae [split] bump util to 4.0.1-SNAPSHOT b105101
@mariusae mariusae [split] ostrich 7.0 ab5555d
@mariusae mariusae [split] release 7.0.0 of ostrich 86079c5
@mariusae mariusae [split] bump ostrich to 7.0.1-SNAPSHOT dc3950c
@mariusae mariusae [split] release 4.0.1 of util 0f58d94
@mariusae mariusae [split] bump util to 4.0.2-SNAPSHOT ffb4689
@mariusae mariusae [split] release 7.0.1 of ostrich f1a8ef7
@mariusae mariusae [split] bump ostrich to 7.0.2-SNAPSHOT 326a37e
Commits on May 11, 2012
@kmonkeyjam kmonkeyjam [split] upping version of maven-plugin 15995a0
@kmonkeyjam kmonkeyjam [split] reverting 83d5bbc5c79325fc019277c040026c73fcdb972d 3aef0b5
Commits on May 24, 2012
@mariusae mariusae [split] util: 4.0.3, stabilized
RB_ID=68041
TBR=true
3c04880
@mariusae mariusae [split] finagle 4.0.5
RB_ID=68078
TBR=true
a4c590c
Ryan King [split] release 3.0.5 of scala-zookeeper-client 0336f99
Ryan King [split] bump scala-zookeeper-client to 3.0.6-SNAPSHOT 7b5491a
Commits on Jul 10, 2012
Ryan King [split] upgrade scala-zookeeper-client to scala 2.9
RB_ID=74817
badd25a
Commits on Jul 11, 2012
Ryan King [split] release 3.0.6 of scala-zookeeper-client 72dc4a1
Ryan King [split] bump scala-zookeeper-client to 3.0.7-SNAPSHOT f8a0381
Commits on Aug 28, 2012
mmcbride [split] setting service-292 and scala-parent-292 versions to 0.0.4 in…
… all projects

RB_ID=83258
TBR=true
6d17ff5
Commits on Sep 27, 2012
@areitz areitz [split] release 3.0.7 of scala-zookeeper-client - Release of deprecat…
…e_scala_zookeeper_client branch

RB_ID=88676
39b7f9f
Commits on Sep 28, 2012
@areitz areitz [split] Destabilize the birdcage
RB_ID=88937
TBR=true
d6ac003
Commits on Nov 30, 2012
Ryan King [split] remove old sbt stuff
RB_ID=99980
006cb8b
Commits on Oct 09, 2013
@ryanking ryanking update readme to make it clear that this project is deprecated e6aecd1
Commits on Nov 11, 2013
@caniszczyk caniszczyk Update README.markdown c8a4189
Something went wrong with that request. Please try again.