| commit | 3705c952425480778ddd51751be4db54cf75bc81 | [log] [tgz] |
|---|---|---|
| author | Sylvain Lebresne <sylvain@datastax.com> | Tue Dec 10 17:13:55 2013 +0100 |
| committer | Sylvain Lebresne <sylvain@datastax.com> | Tue Dec 10 17:13:55 2013 +0100 |
| tree | 497f856584aea46f1183ef3315c71203d5563f07 | |
| parent | b03cdbc1a1331ce175b9aa1cae84dc17fd064903 [diff] | |
| parent | 0483bb842532a4b034da30c6c8f4fc2d6e427f9a [diff] |
Merge branch '1.0' into 2.0 Conflicts: driver-core/src/main/java/com/datastax/driver/core/ConsistencyLevel.java pom.xml