Download as
Browse Code »

Commit 3f65e4d756d6da1b1e2cf635a12f9fb1fadd9f93

Authored by Sytse Sijbrandij
2 parents 844d5d1b 2687803f
Exists in master and in 17 other branches 6-6-stable, 6-6-stable-ee, 6-7-stable, 6-7-stable-ee, 6-8-stable, 6-8-stable-ee, 6-9-stable, 6-9-stable-ee, 7-0-stable, 7-0-stable-ee, 7-0-stable-spb, 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee, branch_test, nginx_ssl_tweaks

Merge branch 'update_omnibus' of /mnt/ebs/repositories/gitlab-org/omnibus-gitlab

Showing 2 changed files with 13 additions and 12 deletions   Show diff stats
1 source 'https://rubygems.org' 1 source 'https://rubygems.org'
2 2
3 -gem 'omnibus', '~> 1.2.0' 3 +gem 'omnibus', '~> 1.3.0'
4 gem 'omnibus-software', :git => 'git://github.com/opscode/omnibus-software.git', :branch => 'master' 4 gem 'omnibus-software', :git => 'git://github.com/opscode/omnibus-software.git', :branch => 'master'
@@ -17,15 +17,16 @@ GEM @@ -17,15 +17,16 @@ GEM
17 ffi (~> 1.0, >= 1.0.11) 17 ffi (~> 1.0, >= 1.0.11)
18 clamp (0.6.3) 18 clamp (0.6.3)
19 ffi (1.9.3) 19 ffi (1.9.3)
20 - fpm (0.4.42) 20 + fpm (1.0.1)
21 arr-pm (~> 0.0.8) 21 arr-pm (~> 0.0.8)
22 backports (>= 2.6.2) 22 backports (>= 2.6.2)
23 cabin (>= 0.6.0) 23 cabin (>= 0.6.0)
24 childprocess 24 childprocess
25 clamp (~> 0.6) 25 clamp (~> 0.6)
  26 + ffi
26 ftw (~> 0.0.30) 27 ftw (~> 0.0.30)
27 json (>= 1.7.7) 28 json (>= 1.7.7)
28 - ftw (0.0.36) 29 + ftw (0.0.38)
29 addressable 30 addressable
30 backports (>= 2.6.2) 31 backports (>= 2.6.2)
31 cabin (> 0) 32 cabin (> 0)
@@ -33,11 +34,11 @@ GEM @@ -33,11 +34,11 @@ GEM
33 http_parser.rb (0.5.3) 34 http_parser.rb (0.5.3)
34 ipaddress (0.8.0) 35 ipaddress (0.8.0)
35 json (1.8.1) 36 json (1.8.1)
36 - mime-types (1.25)  
37 - mixlib-cli (1.3.0)  
38 - mixlib-config (1.1.2) 37 + mime-types (1.25.1)
  38 + mixlib-cli (1.4.0)
  39 + mixlib-config (2.1.0)
39 mixlib-log (1.6.0) 40 mixlib-log (1.6.0)
40 - mixlib-shellout (1.2.0) 41 + mixlib-shellout (1.3.0)
41 ohai (6.20.0) 42 ohai (6.20.0)
42 ipaddress 43 ipaddress
43 mixlib-cli 44 mixlib-cli
@@ -46,10 +47,10 @@ GEM @@ -46,10 +47,10 @@ GEM
46 mixlib-shellout 47 mixlib-shellout
47 systemu (~> 2.5.2) 48 systemu (~> 2.5.2)
48 yajl-ruby 49 yajl-ruby
49 - omnibus (1.2.0)  
50 - fpm (~> 0.4.33)  
51 - mixlib-config (~> 1.1.2)  
52 - mixlib-shellout (~> 1.0) 50 + omnibus (1.3.0)
  51 + fpm (~> 1.0.0)
  52 + mixlib-config (~> 2.1.0)
  53 + mixlib-shellout (~> 1.3.0)
53 ohai (>= 0.6.12) 54 ohai (>= 0.6.12)
54 rake (>= 0.9) 55 rake (>= 0.9)
55 thor (>= 0.16.0) 56 thor (>= 0.16.0)
@@ -65,5 +66,5 @@ PLATFORMS @@ -65,5 +66,5 @@ PLATFORMS
65 ruby 66 ruby
66 67
67 DEPENDENCIES 68 DEPENDENCIES
68 - omnibus (~> 1.2.0) 69 + omnibus (~> 1.3.0)
69 omnibus-software! 70 omnibus-software!