work on merging compressed transaction code
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/82a1df4e Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/82a1df4e Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/82a1df4e Branch: refs/heads/CURATOR-3.0 Commit: 82a1df4e2635a1d7fc04c667dc09bdad513b991b Parents: ba38d4c Author: randgalt <[email protected]> Authored: Mon Jan 18 16:01:43 2016 -0500 Committer: randgalt <[email protected]> Committed: Mon Jan 18 16:01:43 2016 -0500 ---------------------------------------------------------------------- .../framework/api/transaction/TransactionCreateBuilder.java | 2 +- .../java/org/apache/curator/framework/imps/CreateBuilderImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/82a1df4e/curator-framework/src/main/java/org/apache/curator/framework/api/transaction/TransactionCreateBuilder.java ---------------------------------------------------------------------- diff --git a/curator-framework/src/main/java/org/apache/curator/framework/api/transaction/TransactionCreateBuilder.java b/curator-framework/src/main/java/org/apache/curator/framework/api/transaction/TransactionCreateBuilder.java index d20c834..f7b2850 100644 --- a/curator-framework/src/main/java/org/apache/curator/framework/api/transaction/TransactionCreateBuilder.java +++ b/curator-framework/src/main/java/org/apache/curator/framework/api/transaction/TransactionCreateBuilder.java @@ -29,6 +29,6 @@ public interface TransactionCreateBuilder<T> extends CreateModable<ACLPathAndBytesable<T>>, ACLPathAndBytesable<T>, ACLCreateModePathAndBytesable<T>, - Compressible<ACLPathAndBytesable<T>> + Compressible<ACLCreateModePathAndBytesable<T>> { } http://git-wip-us.apache.org/repos/asf/curator/blob/82a1df4e/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java ---------------------------------------------------------------------- diff --git a/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java b/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java index 4d532ff..2eca53c 100644 --- a/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java +++ b/curator-framework/src/main/java/org/apache/curator/framework/imps/CreateBuilderImpl.java @@ -103,7 +103,7 @@ class CreateBuilderImpl implements CreateBuilder, BackgroundOperation<PathAndByt } @Override - public ACLPathAndBytesable<T> compressed() + public ACLCreateModePathAndBytesable<T> compressed() { CreateBuilderImpl.this.compressed(); return this;
