Skip to content
This repository has been archived by the owner on Oct 22, 2023. It is now read-only.

Merge master into devnet2 #954

Draft
wants to merge 93 commits into
base: devnet2
Choose a base branch
from
Draft

Merge master into devnet2 #954

wants to merge 93 commits into from

Conversation

nhynes
Copy link
Contributor

@nhynes nhynes commented Dec 4, 2019

No description provided.

ravenac95 and others added 30 commits August 8, 2019 20:27
@ravenac95
Add staging-devnet2 promotion to production
2a9312b
@ravenac95
Merge pull request #861 from oasislabs/ravenac95/setup-devnet2-promotion
83f72e0 
Add staging-devnet2 promotion to production
@peterjgilbert
gateway: set uncles_hash to empty list (#874)
a016c4a
@ptrus
update dependencies
485b6fc
@ptrus
update ekiden provisioning
c216062
@ptrus
Merge pull request #876 from oasislabs/ptrus/update-ekiden
4af3d1b 
Update ekiden
@ptrus
buildkite/deploy: remove unexisting hwekiden reference
9003b16
@ptrus
Merge pull request #877 from oasislabs/ptrus/remove-hwekiden-ref
f1a2874 
buildkite/deploy: remove unexisting hwekiden reference
@peterjgilbert
Remove old testnet config
58e8fa1
@peterjgilbert
Update readme
268210d
@peterjgilbert
Removed unused buildkite scripts
fa94644
@peterjgilbert
Remove unused scripts
613a743
@peterjgilbert
Merge pull request #878 from oasislabs/peterjgilbert/cleanup
4f50295 
Clean up outdated stuff
@peterjgilbert
Use master branch for buildkite badge (#880)
e6a9a08
@matevz
init: Pass runtime version number to host
fe198ab
@matevz
Merge pull request #879 from oasislabs/matevz/feature/version-runtimes
1054c79 
version: Send version number to the host
@peterjgilbert
Tag log topics by index (#884)
e7e3552
@ptrus
benchmarking: fix benchmarking docker image
5845adf
@ptrus
Merge pull request #885 from oasislabs/ptrus/fix/benchmarks-image
569e350 
benchmarking: fix benchmarking docker image build
@peterjgilbert
Update single node config (#881)
b58aba6
@nhynes
Update Cargo.lock to use oasis-parity with xcc (#875)
8dd4a9a
@peterjgilbert
Use jsonrpc fork (#887)
9c85ab3
@armaniferrante
buildkite: Remove old env variables (#888)
b7c9c0b
@armaniferrante
Enable EIP 145 (#891)
9847c53
@peterjgilbert
Proper runtime API errors (#896)
bc4efd2
@ptrus
genesis_playback: set io_root to empty hash
dc0ba20
@ptrus
Merge pull request #897 from oasislabs/ptrus/fix/genesis-playback-ioroot
f07644b 
genesis_playback: set io_root to empty hash
@ptrus
updating cargo dependencies
5c0771c
@ptrus
Merge pull request #900 from oasislabs/ptrus/feature/cargo-update
c64c953 
updating cargo dependencies
@ptrus
cargo update
f0c576c
peterjgilbert and others added 22 commits October 17, 2019 16:04
@peterjgilbert
Update Cargo.lock (#942)
cab0b4a
@ptrus
dockerfile renamings
6dfd53e
@ptrus
Merge pull request #941 from oasislabs/ptrus/fix/docker-image-renamings
bd4afc9 
dockerfile renamings
@ptrus
README: update ci badge
b401d43
@ptrus
Merge pull request #943 from oasislabs/ptrus/update-ci-badge
39c652b 
README: update ci badge
@ptrus
benchmarking/Dockerfile: fix binary paths
fb89a50
@ptrus
Merge pull request #946 from oasislabs/ptrus/fix/benchmarking-dockerfile
5bc9616 
benchmarking/Dockerfile: fix binary paths
@pro-wh @peterjgilbert
scripts: remove realpath in symlink_artifacts
76e247f 
Co-Authored-By: Peter Gilbert <[email protected]>
@pro-wh
Merge pull request #945 from oasislabs/pro-wh/bugfix/realpath
56d13d9 
RFC: remove `realpath` in symlink_artifacts
@peterjgilbert
ci: fix oasis-core-ci pipeline references
af7b5c2
@peterjgilbert
Update Cargo.lock
c50a178
@peterjgilbert
Merge pull request #947 from oasislabs/peterjgilbert/fix_ci
9110c6c 
ci: fix oasis-core-ci pipeline references
@peterjgilbert
Update Cargo.lock
ddf5c5e
@peterjgilbert
Remove unused testing certs/keys
642e1e3
@peterjgilbert
Merge pull request #948 from oasislabs/peterjgilbert/cargo_update
ab20035
@tjanez
ci: Scope Buildkite build status badge to the master branch
286440d 
Otherwise, the badge shows the last build's status on any branch.
@nhynes
Update flag to oasis-net-runner
4fee39f
@tjanez
Merge pull request #950 from oasislabs/tjanez/scope-buildkite-badge
7f39ab9 
ci: Scope Buildkite build status badge to the master branch
@peterjgilbert
ci: no longer need to exclude some gateway source from coverage (#951)
00c75de
@peterjgilbert
Update Cargo.lock
bf0edd3
@peterjgilbert
Update Cargo.lock
e182561
@nhynes
Disable e2e tests
29fed49
@nhynes nhynes force-pushed the devnet2 branch 6 times, most recently from 5e13918 to d5de624 Compare December 8, 2019 04:33
@ptrus
Copy link
Contributor

ptrus commented Apr 14, 2020

I think devnet2 branch is not needed anymore, so we can delete it right? (and close this PR) cc @peterjgilbert

@peterjgilbert
Copy link
Member

I think devnet2 branch is not needed anymore, so we can delete it right? (and close this PR) cc @peterjgilbert

Yes, I think we can delete devnet2 branch. @nhynes, ack?

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@peterjgilbert peterjgilbert Awaiting requested review from peterjgilbert peterjgilbert will be requested when the pull request is marked ready for review peterjgilbert is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@nhynes @ptrus @peterjgilbert @ravenac95 @matevz @armaniferrante @kostko @pro-wh @tjanez