Skip to content

Fix branch conflicts #17

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.

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

Merged
merged 2 commits into from
Nov 14, 2016
Merged

Fix branch conflicts #17

merged 2 commits into from
Nov 14, 2016

Conversation

mikeproeng37
Copy link
Contributor

@optimizely/fullstack-devs

mikeproeng37 and others added 2 commits October 3, 2016 15:40
* Replace bluebird dependency with smaller es6-promise library.

* Update contribution doc to use CLA (#9)

Update contribution doc to use CLA

* Bump version to 1.0.0 (#10)

Bump version to 1.0.0
Copy link
Contributor

@haleybash-optimizely haleybash-optimizely left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm!

@mikeproeng37 mikeproeng37 merged commit cb3ce5f into devel Nov 14, 2016
@mikeproeng37 mikeproeng37 deleted the mng/fix-branch-conflicts branch November 14, 2016 22:56
mjc1283 added a commit that referenced this pull request Apr 22, 2019
Summary:

- Only assign current datafile if truthy (replace typeof datafile !== 'undefined' check with datafile check)
- Change urlTemplate option to be a sprintf-style format string, like Java's withFormat
- Change backoff delay to increase up to 512 seconds after 7 errors, and clean up the backoff implementation a little
- Clean up url handling in HttpPollingConfigManager. It was saving more private variables than necessary for data that never changes after the constructor.

Test plan:

Updated unit tests
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants