Merge master to staging #1472
Merged
Merge master to staging #1472
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Add test case for ContractPromises.all * Add .then to join test
* query block by hash * fix rpc user
* Remove running and developing as link is dead Also as a test with external contributor * trigger a push
* Remove hello.wasm source (use hello-wasm from npm instead) * Remove unneeded env overrides from test_nearlib.sh * Use `master` nearlib and near-shell * Try kicking CI * Try parallelizing nearlib tests with cargo tests * Remove legacy stuff from GitLab config * Try installing Node using n-install * Fix typo in n-install command * Change the way Node is installed
* remove empty release build * use nearlib master branch * cache 30 days and concurrent build
* Remove running and developing as link is dead Also as a test with external contributor * trigger a push * Update links * Update ci badge * Update README.md
* run nearlib release test on master * fix ci syntax * run test nearlib release on all branch * chmod * working around yarn * correct pathname for some tests * fix hellowasm path * fix with new nearlib version and refactor * Fix typo
* Prometheus (#1416) * Http API enpoint for prometheus and simple yml file Signed-off-by: Kirk Baird <baird.k@outlook.com> * Begin creating a grafana dashboard to represent near features Signed-off-by: Kirk Baird <baird.k@outlook.com> * Add a grafana dashboard Signed-off-by: Kirk Baird <baird.k@outlook.com> * Update to metrics readme * More updates to the metrics readme * Add prometheus metrics Signed-off-by: Kirk Baird <baird.k@outlook.com> * Update grafana Signed-off-by: Kirk Baird <baird.k@outlook.com> * Update metrics and docs * Move near-metrics into core/metrics. Change versions of lazy_static from ^ to specific version for predictability
ailisp
requested review from
evgenykuzyakov,
ilblackdragon,
maxzaver and
SkidanovAlex
as code owners
Merged
ilblackdragon
approved these changes
Oct 17, 2019
|
@bowenwang1996 @nearmax @janedegtiareva @vgrichina Any reviews? |
| @@ -3,4 +3,3 @@ | |||
| /chain/ @ilblackdragon @SkidanovAlex | |||
|
|
|||
| /runtime/ @nearmax @evgenykuzyakov | |||
|
|
|||
There was a problem hiding this comment.
Why is this line removed?
There was a problem hiding this comment.
having line 5 duplicate by merging, then line 6 was removed by mistake
There was a problem hiding this comment.
wtf. i do have line 6 locally 🤔
maxzaver
approved these changes
Oct 17, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.