gistfile1.txt

pick 4c2ff85 reduce Dagger complexity by flattening credential providers and decoupling DNS Provider classes from the
ir Modules
pick 75d819b credential args are more naturally specified by a user as Supplier vs Provider
pick 57498e8 remove circular dependency between denominator.Provider and its Module
pick c3f38e0 use MockProvider.Module to compress tests
pick e140cc0 remove extraneous dependencies from clouddns
pick ad4977a issue #150: expose Provider.getUrl and support dynamic url updates
pick ce669a5 issue #150: change mock tests to override Provider.getUrl
pick eed99ec issue #150: added -u --url flag to the cli
pick 663c0bd issue #150: added PROVIDER.url test property
pick d42a83c updates to README files for 1.1.3 release
pick 35b5e69 fixed typo
pick c528214 first pass
pick 7c1a576 first pass
pick 6a4c860 removed classpath nonsense

# Rebase 81919dd..5cc484f onto 81919dd
#
# Commands:
#  p, pick = use commit
#  r, reword = use commit, but edit the commit message
#  e, edit = use commit, but stop for amending
#  s, squash = use commit, but meld into previous commit
#  f, fixup = like "squash", but discard this commit's log message
#  x, exec = run command (the rest of the line) using shell
#
# These lines can be re-ordered; they are executed from top to bottom.
#
# If you remove a line here THAT COMMIT WILL BE LOST.
#
# However, if you remove everything, the rebase will be aborted.
#
# Note that empty commits are commented out

gistfile2.txt

error: could not apply 4c2ff85... reduce Dagger complexity by flattening credential providers and decoupling DNS Provider classes from their Modules

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".
Could not apply 4c2ff85... reduce Dagger complexity by flattening credential providers and decoupling DNS Provider classes from their Modules

gistfile3.txt

digitalsanctum:denominator shane$ git status
# Not currently on any branch.
# You are currently rebasing.
#   (fix conflicts and then run "git rebase --continue")
#   (use "git rebase --skip" to skip this patch)
#   (use "git rebase --abort" to check out the original branch)
#
# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add <file>..." to mark resolution)
#
#  both modified:      CHANGES.md
#	both modified:      denominator-core/src/main/java/denominator/BasicProvider.java
#	both modified:      denominator-core/src/main/java/denominator/CredentialsConfiguration.java
#	both modified:      denominator-core/src/main/java/denominator/Denominator.java
#	both modified:      denominator-core/src/main/java/denominator/Provider.java
#	both modified:      denominator-core/src/main/java/denominator/mock/MockProvider.java
#	both added:         denominator-core/src/test/java/denominator/CredentialsConfigurationTest.java
#	both modified:      denominator-core/src/test/java/denominator/DynamicCredentialsProviderExampleTest.java
#	both modified:      denominator-core/src/test/java/denominator/ProviderTest.java
#	both modified:      providers/denominator-clouddns/src/main/java/denominator/clouddns/CloudDNSProvider.java
#	both modified:      providers/denominator-clouddns/src/test/java/denominator/clouddns/CloudDNSProviderTest.java
#	both modified:      providers/denominator-dynect/src/main/java/denominator/dynect/DynECTProvider.java
#	both modified:      providers/denominator-dynect/src/test/java/denominator/dynect/DynECTGeoResourceRecordSetApiMockTest.java
#	both modified:      providers/denominator-dynect/src/test/java/denominator/dynect/DynECTProviderTest.java
#	both modified:      providers/denominator-route53/src/main/java/denominator/route53/Route53Provider.java
#	both modified:      providers/denominator-route53/src/test/java/denominator/route53/Route53ProviderTest.java
#	both modified:      providers/denominator-ultradns/src/main/java/denominator/ultradns/UltraDNSProvider.java
#	both modified:      providers/denominator-ultradns/src/test/java/denominator/ultradns/UltraDNSGeoResourceRecordSetApiMockTest.java
#	both modified:      providers/denominator-ultradns/src/test/java/denominator/ultradns/UltraDNSProviderTest.java
#
no changes added to commit (use "git add" and/or "git commit -a")

gistfile4.txt

digitalsanctum:denominator shane$ git log
commit 5cc484f10f56e286228573d4d6c615a261970f1f
Merge: c528214 91fe983
Author: digitalsanctum <shane@digitalsanctum.com>
Date:   Mon May 27 12:31:48 2013 -0400

    Merge branch 'config-file-support' of https://github.com/digitalsanctum/denominator into config-file-support
    
    Conflicts:
        denominator-cli/src/main/java/denominator/cli/Denominator.java
        denominator-cli/src/test/java/denominator/cli/DenominatorTest.java
        denominator-cli/src/test/resources/test-config.yml

commit c528214ac6212b3616d5266409480c8dd250d0aa
Author: digitalsanctum <shane@digitalsanctum.com>
Date:   Sun May 26 17:16:06 2013 -0400

    first pass

commit 35b5e69e7d251728baabc8db6d4544c9a3f15c86
Author: Adrian Cole <adrian.f.cole@gmail.com>
Date:   Sat May 25 16:51:11 2013 -0600

    fixed typo

commit d42a83ca848dca256dc7fd06b045e47d0fd0ebf8
Author: adriancole <adrian.f.cole@gmail.com>
Date:   Sat May 25 09:50:33 2013 -0700

    updates to README files for 1.1.3 release

commit 663c0bd7074da5c7af06b0a10dd534cd3f887712
Author: adriancole <adrian.f.cole@gmail.com>
Date:   Fri May 24 21:30:06 2013 -0700

    issue #150: added PROVIDER.url test property

commit eed99ec62d29e6fb963875d494f57c9c75de042b
Author: adriancole <adrian.f.cole@gmail.com>
Date:   Fri May 24 21:16:26 2013 -0700

    issue #150: added -u --url flag to the cli