Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge form upstream #1

Merged
merged 73 commits into from May 1, 2014
Merged

Merge form upstream #1

merged 73 commits into from May 1, 2014

Conversation

h2non
Copy link
Owner

@h2non h2non commented May 1, 2014

No description provided.

h2non and others added 30 commits April 21, 2014 18:19
@h2non
chore(docs): update installation usage
9579696
@h2non
feat(badges): add badges for travis and gemnasium
1417086
@h2non
chore(docs): update README contents
c6578d0
@germanramos
feat(provision): first working version of shell provision (no scp)
9f80962
@h2non
fix: type check for instance script supporting both Hash and Array
977c623
@h2non
chore(#24): rename command from up to start
e70691e
@h2non
chore(#26): add execute command. update command descriptions. remove …
9f9741b 
…env flag
@h2non
chore(#26): add execute command. update command descriptions. remove …
e684db7 
…env flag
@germanramos
feat(provision,scp): execute remote files and scp. colorized.
48dfc72
@h2non
feat(#22): add support for discovery multiple config files
dfb3c29
@h2non
feat(#23, #22): add support for custom config file path. minor refactors
8602034
@h2non
chore(docs): fix link to RSpec conventions
6634876
@h2non
chore(scp): remove unused modules
5fbc72f
@h2non
chore(scp): throw exception on scp error
2b15001
@h2non
feat(cli): add utils module in CLI
55e83ac
@h2non
chore(file_utils): remove puts statement
753cce2
@germanramos
feat(getInstance): Test before provision
dc73b3d 
feat(start): Not working yet
@h2non
chore(config): support script based on arrays and hashes
a35c46e
@h2non
chore(config): remove string members from config hash
2cd7b21
@germanramos
Resolve conflict
dd78ca5
@germanramos
feat(start): working but pending refactor
ce54172
@h2non
chore(docs): add RubyDoc documentation link
3f06b82
@h2non
feat(#28): compare types in config merge
0eff060
@h2non
chore(docs): update documentation description
bfaa3b6
@germanramos
feat(start): refactor
f8e832f
@germanramos
Merge branch 'master' of github.com:innotech/dployr
a20d74a 
Conflicts:
	lib/dployr/start/start.rb
@germanramos
feat(start,stop): with aws. And refactor.
4861765
@germanramos
feat(test,execute,deploy): all commands working and big refactor
9f74e61
@germanramos
refactor(cli): removed directory cli
e7b7d5e
@h2non
chore: update files
28f5375
germanramos and others added 28 commits April 28, 2014 17:25
@germanramos
feat(gce): google provider first working version
d0fa24f
@germanramos
bug(shell): missing arguments
64a7190
@germanramos
bug(gce): destroy disk
3f45a73
@h2non
fix(config): force type to Hash if nil
80e4d70
@h2non
chore(commands): remove logger module dependency
c519fd1
@germanramos
feat(config): custom config when provider and region specified
b666c85
@germanramos
feat(ssh): working ssh command
62fdc40
@germanramos
feat(gce): destroy removes disks
2aa7c8b 
bug(shell): do not hang after script ends
@h2non
chore(cli): exit on version flag
2de1e2c
@h2non
chore(docs): update documentation, usage info and features
e84886d
@h2non
chore(version): upgrade version to 0.0.4
00f1659
@germanramos
feat(config): integration tests for config command
a5ebd08
@h2non
feat(#36): write config from passed aditional attributes on config re…
d29b8a5 
…ndering
@h2non
chore(test): fix command config test
c0b89c5
@h2non
chore(files): add missing fixture files
385e0f2
@h2non
chore(config): update config command error output and update test spec
8abae45
@h2non
chore(command config): fix config command CLI test spec
8eeb844
@h2non
chore(command config): add test case for config replace value
de10a56
@h2non
chore(command config): fix config command CLI test spec
1acf1db
@germanramos
feat(public_ip): aws and gce
1600e3f
@h2non
feat(#15): add custom context name replace value. minor config refactor
97efab1
@h2non
refactor(config): minor refactor and config command improvments
3626104
@h2non
chore(config): remove puts statement from test spec
8370fdb
@h2non
chore(version): upgrade gem version to 0.0.5 future release
a08630e
@germanramos
feat(info): show info of created instance
630d98f
@germanramos
feat(public-ip): use public ip instead private ip for accessing insta…
fe0fe79 
…nces

feat(info): print instance info in yaml format
bug(scripts): fix some bug executing remote and local scripts
test(real): script for test real deployment in aws and gce
bug(other): fix same other minor bugs
@germanramos
new version
9e984d5
@h2non
chore: pre-merge commit
a5f82a1
h2non pushed a commit that referenced this pull request May 1, 2014
Merge pull request #1 from innotech/master
a5036f6 
Merge form upstream
@h2non h2non merged commit a5036f6 into h2non:master May 1, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@h2non @germanramos