Skip to content
This repository was archived by the owner on Mar 26, 2020. It is now read-only.

Commit 3d123bd

Browse files
authored
Merge pull request #590 from kshlm/prepare-for-4.0.0
Prepare for 4.0.0
2 parents 9f08c39 + d3d382a commit 3d123bd

5 files changed

Lines changed: 9 additions & 17 deletions

File tree

Gopkg.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,6 @@
8686
name = "google.golang.org/grpc"
8787
version = "^1.0.4"
8888

89-
[[constraint]]
90-
name = "gopkg.in/yaml.v2"
91-
branch = "v2"
92-
9389
[[constraint]]
9490
name = "github.com/asaskevich/govalidator"
9591
version = "v8"

extras/rpms/glusterd2.spec

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
%global gd2make %{__make} PREFIX=%{_prefix} EXEC_PREFIX=%{_exec_prefix} BINDIR=%{_bindir} SBINDIR=%{_sbindir} DATADIR=%{_datadir} LOCALSTATEDIR=%{_sharedstatedir} LOGDIR=%{_localstatedir}/log SYSCONFDIR=%{_sysconfdir} FASTBUILD=off
2525

2626
Name: %{repo}
27-
Version: 4.0rc0
28-
Release: 2%{?dist}
27+
Version: 4.0.0
28+
Release: 1%{?dist}
2929
Summary: The GlusterFS management daemon (preview)
3030
License: GPLv2 or LGPLv3+
3131
URL: https://%{provider_prefix}
@@ -45,7 +45,7 @@ BuildRequires: golang(github.com/cespare/xxhash)
4545
BuildRequires: golang(github.com/cockroachdb/cmux)
4646
BuildRequires: golang(github.com/coreos/etcd/clientv3)
4747
BuildRequires: golang(github.com/coreos/etcd/clientv3/concurrency)
48-
#BuildRequires: golang(github.com/coreos/etcd/clientv3/namespace)
48+
BuildRequires: golang(github.com/coreos/etcd/clientv3/namespace)
4949
BuildRequires: golang(github.com/coreos/etcd/embed)
5050
BuildRequires: golang(github.com/coreos/etcd/etcdserver/etcdserverpb)
5151
BuildRequires: golang(github.com/coreos/etcd/pkg/transport)
@@ -70,7 +70,8 @@ BuildRequires: golang(golang.org/x/sys/unix)
7070
BuildRequires: golang(google.golang.org/grpc)
7171
%endif
7272

73-
Requires: glusterfs-server >= 4.0rc0
73+
Requires: glusterfs-server >= 4.0.0
74+
Requires: /usr/bin/strings
7475
%{?systemd_requires}
7576

7677
%description
@@ -120,6 +121,9 @@ install -d -m 0755 %{buildroot}%{_localstatedir}/log/%{name}
120121
%{_sysconfdir}/bash_completion.d/glustercli.sh
121122

122123
%changelog
124+
* Wed Feb 28 2018 Kaushal M <kshlmster@gmail.com> - 4.0.0
125+
- Update to v4.0.0
126+
123127
* Wed Feb 14 2018 Kaushal M <kshlmster@gmail.com> - 4.0rc0-2
124128
- Update spec to support unbundled/vendored builds
125129
- Fedora defaults to bundled builds till all required dependencies are available

glusterd2.json.example

Lines changed: 0 additions & 5 deletions
This file was deleted.

glusterd2.yaml.example

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)