Permalink
Switch branches/tags
Nothing to show
Commits on Mar 12, 2015
  1. Code refactored

    s-matyukevich committed Mar 12, 2015
Commits on Mar 9, 2015
Commits on Feb 18, 2015
  1. Initial commit

    s-matyukevich committed Feb 18, 2015
Commits on Feb 5, 2015
  1. Merge pull request #1542 from howbazaar/is-home-set

    jujubot committed Feb 5, 2015
    Don't attempt to read a file if no juju home set.
    
    In order to validate some environ config instances server side, we want to make sure we don't try to read files from the $JUJU_HOME directory as there isn't one set.
    
    
    (Review request: http://reviews.vapour.ws/r/870/)
  2. Merge pull request #1552 from perrito666/fix_1416436

    jujubot committed Feb 5, 2015
    Fixes licencing issues:
    
    This includes updated branches for dependencies:
    * Utils
    * Syslog
    * Testing
    and fixes:
    * 1416436
    * 1416430
    * 1416433
    
    (Review request: http://reviews.vapour.ws/r/881/)
  3. Merge pull request #1533 from cherylj/retry-pro-2

    jujubot committed Feb 5, 2015
    Don't surface machine tags to UI in retry-provisioning
    
    Addresses review comments for PR 1492: juju/juju#1492
    
    (Review request: http://reviews.vapour.ws/r/858/)
  4. Fixes licencing issues:

    Horacio Duran
    Horacio Duran committed Feb 5, 2015
    This includes updated branches for dependencies:
    * Utils
    * Syslog
    * Testing
    and fixes:
    * 1416436
    * 1416430
    * 1416433
  5. Merge pull request #1535 from binary132/gojsonschema-update

    jujubot committed Feb 5, 2015
    Gojsonschema update
    
    Updated:
     - gojsonschema
     - gojsonpointer
     - gojsonreference
     - charm.v4
    
    (Review request: http://reviews.vapour.ws/r/860/)
  6. Merge pull request #1537 from johnweldon/actions-allwatcher

    jujubot committed Feb 5, 2015
    Actions :: AllWatcher updates to include Actions
    
    
    
    (Review request: http://reviews.vapour.ws/r/862/)
  7. typo

    johnweldon committed Feb 5, 2015
  8. Merge pull request #1538 from johnweldon/minor-cleanup

    jujubot committed Feb 5, 2015
    Minor todo comment cleanup
    
    
    
    (Review request: http://reviews.vapour.ws/r/863/)
  9. updated per feedback

    johnweldon committed Feb 5, 2015
  10. Merge pull request #1543 from johnweldon/gofmt-simplify

    jujubot committed Feb 5, 2015
    Product of a 'make simplify' run.
    
    `make simplify` in the project Makefile calls `gofmt -l -w -s .`, which
    cleans up code that is more complicated than necessary.
    
    This PR is just the result of running that command from the project
    Makefile.
    
    (Review request: http://reviews.vapour.ws/r/871/)
  11. Product of a 'make simplify' run.

    johnweldon committed Feb 5, 2015
    make simplify in the project Makefile calls `gofmt -l -w -s .`, which
    cleans up code that is more complicated than necessary.
    
    This PR is just the result of running that command in the project
    Makefile.
  12. Stop exposing tags through the UI

    Cheryl Jennings
    Cheryl Jennings committed Feb 5, 2015
Commits on Feb 4, 2015
  1. Update godeps versions for gojsonschema update

    binary132 committed Feb 4, 2015
    Updated:
     - gojsonschema
     - gojsonpointer
     - gojsonreference
     - charm.v4
  2. Merge pull request #1517 from fwereade/simple-relation-update-op

    jujubot committed Feb 4, 2015
    Simple relation update op
    
    This is trivial -- it's just putting the relations.Update call inside an operation and thus reducing the (direct!) dependency of the modes upon the relations.
    
    (Review request: http://reviews.vapour.ws/r/841/)
  3. Merge pull request #1502 from dooferlad/ec2-addressable-containers

    jujubot committed Feb 4, 2015
    Add Environ NetworkInterfaces for EC2
    
    This returns NetworkInterfaces information for an EC2 instance needed for container addressability.
    
    (Review request: http://reviews.vapour.ws/r/824/)
  4. Merge pull request #1527 from mjs/1416579-fix-TestManageEnviron

    jujubot committed Feb 4, 2015
    cmd/jujud/agent: make TestManageEnviron more reliable
    
    Sampling the workers that appear in ShortWait time was unreliable and frequently failed on slower CI test hosts/archs. Wait up to LongWait for the specific last worker we expect to appear instead.
    
    fakeSingularRunner.started() was removed since it's now not used.
    
    Fixes LP #1416579.
    
    (Review request: http://reviews.vapour.ws/r/852/)
  5. Merge pull request #1523 from howbazaar/container-mess-fixes

    jujubot committed Feb 4, 2015
    Ensure mounted log dir exists.
    
    Use the juju/errors package instead of the standard lib errors package.
    
    The LXC containers were failing to start in non-state server environments
    due to the logging directory not existing.  The log dir is mounted into
    the local provider containers as /var/log/juju.  For the state server
    environment, the /var/log/juju-<user>-<envname> had been created by the
    syslog process already.  Newer environment did not have a log directory
    created.  Since the directory is being created by "root:root", we need
    the permissions of the directory to be sufficiently lax so the syslog
    user can write to it, hence 0777.
    
    (Review request: http://reviews.vapour.ws/r/848/)
  6. Merge pull request #1497 from waigani/migrate-presence

    jujubot committed Feb 4, 2015
    State: Make presence watcher and pinger mulit-env aware
    
    Pass in the environment UUID to presence.NewWatcher and NewPinger. Use
    the UUID to ensure .beings .seqs and .pings collections are
    environment specific. Test that the watcher sees ping events isolated
    to its environment. Move the setup of the presence watcher for state
    to a place where we have the environment UUID available.
    
    (Review request: http://reviews.vapour.ws/r/819/)
  7. Merge branch 'master' of https://github.com/juju/juju into migrate-pr…

    waigani committed Feb 4, 2015
    …esence
    
    Conflicts:
    	state/open.go
  8. Merge pull request #1520 from howbazaar/state-server-addresses

    jujubot committed Feb 4, 2015
    state server addresses should look at the state server environment.
    
    The provisioner asks for the state server addresses.  When it asked for the non-state server environment, everything died.
    
    
    (Review request: http://reviews.vapour.ws/r/844/)
  9. Merge pull request #1525 from howbazaar/state-initialize-twice-fails

    jujubot committed Feb 4, 2015
    Initializing twice is an error.
    
    Fix crazy.
    
    (Review request: http://reviews.vapour.ws/r/850/)
  10. Merge pull request #1522 from howbazaar/log-error-stack

    jujubot committed Feb 4, 2015
    Handy util function for unexpected errors.
    
    
    
    (Review request: http://reviews.vapour.ws/r/846/)