summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-01-19Switch to phusion's docker-baseimage, to get service management and process ↵Mike Bryant
reaping
2016-01-18Merge pull request #270 from Shopify/fix-issue-268ytti
do not include executed command name in output
2016-01-18do not include executed command name in outputElvin Efendi
2016-01-18Merge pull request #267 from MrRJ45/patch-2ytti
Update README.md
2016-01-18Update README.mdMrRJ45
Fixes #256
2016-01-17Merge pull request #266 from laf/http-basic-authytti
Added support for using basic auth in http source
2016-01-17Added support for using basic auth in http sourcelaf
2016-01-15Merge pull request #265 from Shopify/fix-issue-264ytti
fixes issue #264
2016-01-15fixes issue #264Elvin Efendi
2016-01-09Merge pull request #260 from will-h/patch-1ytti
Update README.md
2016-01-09Update README.mdwill-h
Minor doc updates
2016-01-06release 0.10.0Saku Ytti
2016-01-04Merge pull request #250 from Shopify/master0.10.0ytti
refactoring, test coverage and github hook
2016-01-04Merge pull request #17 from Shopify/merge-upstreamElvin Efendi
Merge upstream
2016-01-04use latest net-sshElvin Efendi
2016-01-04return back build related tasksElvin Efendi
2016-01-04merge versionElvin Efendi
2016-01-04Merge remote-tracking branch 'upstream/master' into merge-upstreamElvin Efendi
2015-12-30Merge pull request #254 from supertylerc/214-bug/update-net-ssh-versionytti
Update net-ssh version dependecy.
2015-12-30Merge pull request #253 from supertylerc/242-bug/fix-groups-varsytti
Fix groups vars.
2015-12-29Update net-ssh version dependecy.Tyler Christiansen
Closes #214.
2015-12-29Fix groups vars.Tyler Christiansen
Fixes ytti/oxidized#242. Fixes ytti/oxidized-web#38. Added a check to verify the key exists for a group before returning. Might fic a group issue in ytti/oxidized#171.
2015-12-28Merge pull request #238 from danbaugher/masterytti
Added upstart job for ubuntu RVM installs
2015-12-28Merge pull request #251 from nickhilliard/masterytti
expose git repo name and commit oid in hook mechanism and env-vars
2015-12-27added warning not to set the staging directory to be the same as the git repoNick Hilliard
2015-12-27Added git-to-email scriptNick Hilliard
2015-12-27expose git repo name and commit oid in hook mechanism and environment variablesNick Hilliard
2015-12-22Merge pull request #249 from asynet/patch-1ytti
Update fortios.rb
2015-12-21Update fortios.rbasynet
Changing the regex makes possible to backup devices with FortiOS 4.x and long names
2015-12-21Merge pull request #248 from MrRJ45/patch-1ytti
Identify Stackable Switches
2015-12-17Identify Stackable SwitchesMrRJ45
Change how we identify stackable switches using the word "Unit" to identify this. This is more reliable than identifying the Model number.
2015-12-13Merge pull request #15 from Shopify/issue-14Elvin Efendi
do not commit when there is no diff
2015-12-13do not commit when there is no diffElvin Efendi
2015-12-13Merge pull request #13 from Shopify/refactoringElvin Efendi
Refactoring
2015-12-13refactor and fix bugs introduced with new changesElvin Efendi
2015-12-13Merge pull request #12 from Shopify/github-auth-optsElvin Efendi
let user configure which auth method to use
2015-12-13let user configure which auth method to useElvin Efendi
2015-12-09Merge pull request #11 from Shopify/clean-modelElvin Efendi
keep the config output clean
2015-12-09keep the config output cleanElvin Efendi
2015-12-08Merge pull request #10 from Shopify/detect-conflictElvin Efendi
Detect conflict
2015-12-08fix specElvin Efendi
2015-12-08warn when there is a conflictElvin Efendi
2015-12-07Merge pull request #9 from Shopify/pull-masterElvin Efendi
Pull master
2015-12-07fix testElvin Efendi
2015-12-07pull origin/master before pushingElvin Efendi
2015-12-07Merge pull request #8 from Shopify/fix-stripping-bugElvin Efendi
bug fix
2015-12-07bug fixElvin Efendi
2015-12-04Merge pull request #7 from Shopify/pid-guardElvin Efendi
do not start new instance when there is one running
2015-12-04do not start new instance when there is one runningElvin Efendi
2015-12-04consider local repo mainElvin Efendi