Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Users/ramthi/resolveconflicts #530

Merged
merged 19 commits into from
Jun 4, 2019
Merged

Users/ramthi/resolveconflicts #530

merged 19 commits into from
Jun 4, 2019

Commits on Jan 17, 2017

  1. Merge pull request #175 from Microsoft/develop 

    Release v.0.18.0
    Kamil Szostak committed Jan 17, 2017
    Configuration menu
    Copy the full SHA
    a983c31 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2017

  1. Merge pull request #204 from Microsoft/develop 

    Release v0.19.0
    @OsvaldoRosado
    OsvaldoRosado committed Mar 9, 2017
    Configuration menu
    Copy the full SHA
    2116076 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2017

  1. Merge pull request #245 from Microsoft/develop 

    Re-merge 0.20 to master
    @OsvaldoRosado
    OsvaldoRosado committed May 10, 2017
    Configuration menu
    Copy the full SHA
    6aef68c View commit details
    Browse the repository at this point in the history

Commits on May 26, 2017

  1. Merge pull request #258 from Microsoft/develop 

    Merge develop to master for 0.20.1
    Kamil Szostak committed May 26, 2017
    Configuration menu
    Copy the full SHA
    287ed57 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2017

  1. Merge pull request #281 from Microsoft/develop 

    Merge develop into master for v0.21.0
    @OsvaldoRosado
    OsvaldoRosado committed Jun 14, 2017
    Configuration menu
    Copy the full SHA
    4325e12 View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2017

  1. Merge pull request #316 from Microsoft/develop 

    Merge develop to master for 0.22 release
    @OsvaldoRosado
    OsvaldoRosado committed Sep 8, 2017
    Configuration menu
    Copy the full SHA
    7a6357b View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2017

  1. Merge pull request #337 from Microsoft/develop 

    Merge develop to master for 1.0
    @OsvaldoRosado
    OsvaldoRosado committed Oct 3, 2017
    Configuration menu
    Copy the full SHA
    96ddd67 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2017

  1. Merge pull request #355 from Microsoft/develop 

    Merge develop to master for 1.0.1
    @OsvaldoRosado
    OsvaldoRosado committed Nov 29, 2017
    Configuration menu
    Copy the full SHA
    001cc4f View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2018

  1. Merge pull request #370 from Microsoft/develop 

    Merge develop to master for 1.0.2
    @OsvaldoRosado
    OsvaldoRosado committed Feb 21, 2018
    Configuration menu
    Copy the full SHA
    a637a74 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2018

  1. Merge pull request #399 from Microsoft/develop 

    Merge develop to master for 1.0.3
    @OsvaldoRosado
    OsvaldoRosado committed Jun 1, 2018
    Configuration menu
    Copy the full SHA
    4dd58fd View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2018

  1. Merge pull request #422 from Microsoft/develop 

    Merge develop to master for 1.0.4
    @OsvaldoRosado
    OsvaldoRosado committed Aug 29, 2018
    Configuration menu
    Copy the full SHA
    d434576 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2018

  1. Merge pull request #430 from Microsoft/develop 

    Merge develop to master for 1.0.5
    @OsvaldoRosado
    OsvaldoRosado committed Sep 25, 2018
    Configuration menu
    Copy the full SHA
    c61dcaf View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2018

  1. Merge pull request #442 from Microsoft/develop 

    Merge develop to master for 1.0.6
    @OsvaldoRosado
    OsvaldoRosado committed Oct 16, 2018
    Configuration menu
    Copy the full SHA
    de8679a View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2018

  1. Merge pull request #457 from Microsoft/develop 

    Merge develop to master for 1.0.7
    @OsvaldoRosado
    OsvaldoRosado committed Nov 19, 2018
    Configuration menu
    Copy the full SHA
    e0c1505 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2018

  1. Merge pull request #471 from Microsoft/develop 

    Merge develop to master for 1.0.8
    @OsvaldoRosado
    OsvaldoRosado committed Dec 11, 2018
    Configuration menu
    Copy the full SHA
    bf8dee9 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2019

  1. Merge pull request #481 from Microsoft/develop 

    release 1.1.0
    @OsvaldoRosado
    OsvaldoRosado committed Jan 30, 2019
    Configuration menu
    Copy the full SHA
    1c7bd90 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2019

  1. Merge pull request #488 from Microsoft/develop 

    release 1.2.0
    @OsvaldoRosado
    OsvaldoRosado committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    a477a47 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2019

  1. release 1.3.0 (#502) 

    * add live metrics (#494)

* add QPS files; enablement not included

* add tests; add qps ping retry walkback

* add off by default config option for QPS

* add qps test to ensure off by default

* only construct qps when enabled

* add qps Sender constants

* add QuickPulseEnvelopeFactory

* fix ts timer compile

* add qps exception and trace error handling

* refactor default live metrics test

* make qps hostname configurable

* fix node0 setTimeout error

* add qps telemetrytype constants

* move away from export enums for ts backcompat

* add qps EventDocument,fix dependency duration

* use envelope type in qps telemetryprocessor

* send avg execution duration instead of last dur

* add error logging for qps endpoint

* add telemetry types, move qps config to qpssender

* fix keying type issue in TelemetryType

* fix wrong telemetrytype in qps conversion (#500)

* bump version to 1.3.0 (#501)

* bump version to 1.3.0

* add setSendLiveMetrics to README
    @markwolff @ramthi
    markwolff authored and ramthi committed Apr 3, 2019
    Configuration menu
    Copy the full SHA
    c69b5b2 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2019

  1. Merge branch 'master' into develop

    @ramthi
    ramthi committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    b5ec9a0 View commit details
    Browse the repository at this point in the history