Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: platinummonkey/rexpro-python
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: atomos/rexpro-python
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 16 commits
  • 2 files changed
  • 2 contributors

Commits on Aug 14, 2014

  1. Infinity Pool

    Adam Berlinsky-Schine authored and Adam Berlinsky-Schine committed Aug 14, 2014
    Configuration menu
    Copy the full SHA
    bda0f6a View commit details
    Browse the repository at this point in the history

  2. quieting an annoying benign warning

    Adam Berlinsky-Schine authored and Adam Berlinsky-Schine committed Aug 14, 2014
    Configuration menu
    Copy the full SHA
    864b157 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2014

  1. Merge pull request #1 from platinummonkey/master 

    Pulling in 0.3.3
    atomos committed Oct 15, 2014
    Configuration menu
    Copy the full SHA
    78aedc0 View commit details
    Browse the repository at this point in the history

  2. Randomly select among available hosts/ports if list is provided

    Adam Berlinsky-Schine authored and Adam Berlinsky-Schine committed Oct 15, 2014
    Configuration menu
    Copy the full SHA
    48624b8 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/atomos/rexpro-python 

    Conflicts:
	rexpro/connectors/base.py
    Adam Berlinsky-Schine authored and Adam Berlinsky-Schine committed Oct 15, 2014
    Configuration menu
    Copy the full SHA
    d510f97 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2014

  1. Automatic failover

    Adam Berlinsky-Schine authored and Adam Berlinsky-Schine committed Nov 13, 2014
    Configuration menu
    Copy the full SHA
    901f920 View commit details
    Browse the repository at this point in the history

  2. fixes

    Adam Berlinsky-Schine authored and Adam Berlinsky-Schine committed Nov 13, 2014
    Configuration menu
    Copy the full SHA
    4002edb View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:platinummonkey/rexpro-python into… 

    … platinummonkey-master

Conflicts:
	rexpro/connectors/base.py
    Adam Berlinsky-Schine authored and Adam Berlinsky-Schine committed Nov 13, 2014
    Configuration menu
    Copy the full SHA
    49e561b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'platinummonkey-master'

    Adam Berlinsky-Schine authored and Adam Berlinsky-Schine committed Nov 13, 2014
    Configuration menu
    Copy the full SHA
    1046470 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into automatic_failover 

    Conflicts:
	rexpro/connectors/base.py
    Adam Berlinsky-Schine authored and Adam Berlinsky-Schine committed Nov 13, 2014
    Configuration menu
    Copy the full SHA
    1160af7 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #3 from atomos/automatic_failover 

    Titan automatic failover
    atomos committed Nov 13, 2014
    Configuration menu
    Copy the full SHA
    ad00f72 View commit details
    Browse the repository at this point in the history

  7. extra prints

    Adam Berlinsky-Schine authored and Adam Berlinsky-Schine committed Nov 13, 2014
    Configuration menu
    Copy the full SHA
    f4742f4 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2014

  1. multiple connection bug

    Adam Berlinsky-Schine authored and Adam Berlinsky-Schine committed Nov 19, 2014
    Configuration menu
    Copy the full SHA
    d5cbc93 View commit details
    Browse the repository at this point in the history

  2. better retry

    Adam Berlinsky-Schine authored and Adam Berlinsky-Schine committed Nov 19, 2014
    Configuration menu
    Copy the full SHA
    4dceefc View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2014

  1. Improved error handling

    Adam Berlinsky-Schine authored and Adam Berlinsky-Schine committed Dec 4, 2014
    Configuration menu
    Copy the full SHA
    93f8106 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2015

  1. It's not even using that

    Adam Berlinsky-Schine committed Aug 28, 2015
    Configuration menu
    Copy the full SHA
    1a5c29e View commit details
    Browse the repository at this point in the history
Loading